Auto merge of #1143 - alexcrichton:issue-1138, r=huonw
authorbors <bors@rust-lang.org>
Fri, 9 Jan 2015 23:38:12 +0000 (23:38 +0000)
committerbors <bors@rust-lang.org>
Fri, 9 Jan 2015 23:38:12 +0000 (23:38 +0000)
Same fix as #923.

Closes #1138


Trivial merge